Starting to merge in new manual changes.
Authored by: m0slevin 2015-12-18
Parent: [r282]
Child: [r284]