+Merging the OCIL20 branch back into trunk.
Authored by: danmitch 2011-12-28
Parent: [r1069]
Child: [r1071]