Set default push behavior to "simple"
Merge branch 'master' into develer