Merge branch 'master' into 'hardware'

# Conflicts:
#   APIs.rst
1 job for hardware in 3 minutes and 59 seconds (queued for 2 seconds)