copy from trunk (REL_4.2) to start development on v4.3
Authored by: badukaire 2012-05-11
Parent: [r75]
Child: [r77]