4.2.9-dev

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit 'b0d3056'
4.2.9-dev

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