Merge commit '6c7f67bdf87ad8052a48d5b9580c2950879e2dc6'

jbrichau: Merge remote-tracking branch 'svenc/master'
Merge branch 'master' into issue_34