4.2.12-dev

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '036549a'