hipchat travise-ci notify
fix
fix
fix
fix
Merge remote-tracking branch 'origin/dev-master'