saner default
auto-merge staging into master