Merge remote branch 'upstream/master' into release0.21.0

Conflicts:
	extern/shiny/Main/Factory.cpp
#
# It looks like you may be committing a MERGE.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.
#

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch release0.21.0
# Changes to be committed:
#
#	modified:   extern/shiny/Main/Factory.cpp
#	modified:   extern/shiny/Main/Factory.hpp
#
