4.3.2-dev

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

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