Adding in some changes to branch2.
Merge branch 'branch2-master'

* branch2-master:
  Adding in some changes to branch2.