Merge branch 'master' into 'dev'

# Conflicts:
#   README.md
#   app.py
1 job for dev in 1 minute and 23 seconds (queued for 1 second)
latest