Merge remote-tracking branch 'upstream/master' into mysql-mysteries, fix conflicts, fix failing tests.