Merge remote-tracking branch 'origin/master'

# Conflicts:
#	docs/library.rst
3 jobs for master
in 56 seconds and was queued for 8 seconds