Use rev-parse to get short commit hash

Also ensures unique
Merge branch 'pr/1789' into develop

Conflicts:
	.travis.yml