4.1.7-dev

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

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