Merge remote-tracking branch 'origin/master' into update-spring-version

# Conflicts:
#	pom.xml
1 job for !167 with update-spring-version in 8 seconds (queued for 4 seconds)
merge request