auto-merge nightly into master
Fixed conflict
syntax checker
auto-merge staging into master
auto-merge staging into master
auto