Merge branch 'master' into 'bram.kohlen'

# Conflicts:
#   pom.xml
2 jobs for bram.kohlen in 1 minute and 31 seconds (queued for 1 second)