Merge remote-tracking branch 'upstream/master' into archetypes

Conflicts mitigated

Conflicts:
	lib/topic_creator.rb