4.2.2-dev

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '6be855a'
4.2.2-dev

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