Merge branch 'master' into 'dev'

# Conflicts:
#   pom.xml
1 job for dev in 54 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Maven
passed #1248272
linux_maven_branch

00:00:54