Attributed some changes to the wrong version
Authored by: andy_rushton 2013-05-25
Parent: [r484]
Child: [r486]