4.1.2-dev

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '60b0631'
4.1.2-dev

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