Merge branch 'master' into develop

CHANGELOG

CMakeLists.txt

container/Dockerfile

container/Singularity

doc/conf.py.in

doc/html/_sources/changelog.rst.txt

doc/html/_sources/cmake/index.rst.txt

doc/html/_sources/dev_setup.rst.txt

doc/html/_static/_sphinx_javascript_frameworks_compat.js

doc/html/_static/ajax-loader.gif

doc/html/_static/alabaster.css

doc/html/_static/basic.css

doc/html/_static/comment-bright.png

doc/html/_static/comment-close.png

doc/html/_static/comment.png

doc/html/_static/doctools.js

doc/html/_static/documentation_options.js

doc/html/_static/down-pressed.png

doc/html/_static/down.png

doc/html/_static/forkme_right_darkblue_121621.png