Merge branch 'naggie'

Conflicts:
	bin/sync-projects