TGT-1001
Arrggg
Merge branch 'master' of https://github.com/dnuttle/gitlab into TGT-1001_master

Conflicts:
	test.txt
TGT-1001 ready to push