set default push strategy
Merge branch 'master' into activevideo