auto-merge nightly into master
auto