set new branches to rebase on pull
Merge branch 'master' into activevideo