Merge branch 'master' of https://github.com/TheThingSystem/steward

Conflicts:
	CHANGELOG.md