Updating deploy to new repo
Merge branch 'master' into v1.2.1