4.2.7-dev

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

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