4.3.1-dev

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

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