Merge remote-tracking branch 'origin/develop' into custom-templates

# Conflicts:
#	development-workflow.md

Author: janoshrubos