Rebased branch again from trunk latest
Authored by: toaomalkster 2013-12-21
Parent: [r733]
Child: [r735]