HCOLL-121 attempting to get the release to work
Merge remote-tracking branch 'origin/master'