Merged with previous changes by James
Authored by: Davide Di Ruscio 2014-06-25
Parent(s): [346755]
Child(ren): [45ce58]