Merge branch 'master' into 'v0.5.0-markus'

# Conflicts:
#   README.md
6 jobs for v0.5.0-markus in 15 minutes and 52 seconds (queued for 1 second)