Merge branch 'master' into buildings_rewrite

Merge changes from master up to 555c8689a232394cf2e4cd060c03d285a9cee7ca.