4.2.8-dev

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

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