4.1.14-dev

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

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