More testing with syncing branches.
Merge branch 'master' into new

* master:
  More testing with syncing branches.