Refrence upgrades and Codemaid cleanup
Authored by: brett1981 2013-08-13
Parent: [r134]
Child: [r136]