Merge branch 'develop' into 'mouse.over.image'

# Conflicts:
#   config.toml
1 job for mouse.over.image in 6 seconds (queued for 1 second)