removing dev-master alias
Merge branch 'master' into dev