Manually merge changes from 5_15
Authored by: b_calderwood 2014-01-15
Parent: [r7625]
Child: [r7627]