4.1.8-dev

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

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