Merge branch 'master' into corrections

# Conflicts:
#	Documentation/Manual.rst
3 jobs for corrections in 2 minutes and 47 seconds (queued for 2 seconds)