4.2.0-rc1

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '3d6362a' into QA_4_2
4.2.1-dev

Signed-off-by: Marc Delisle <marc@infomarc.info>