Merge changes from topic 'mwd-merge-052115'

* changes:
  Merge commit '744e99a' into merge
  Merge commit 'b6548a9' into merge
  Merge commit '8fcb290' into merge