Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
update build script to work with bamboo
Fixed a mistake in changelog task pointing to the wrong url
Merge branch 'master' into dev