Set git push.default to current
Merge branch 'mavericks'