Merge remote-tracking branch...

Merge remote-tracking branch 'origin/develop-87-add-extra-name-options-to-the-time-variable-for-phenomena'

# Conflicts:
#	CHANGELOG.rst