4.1.1-dev

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit 'd31e966'
Fix merge conflict

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