Merge changes from topic 'mwd-merge-042415'

* changes:
  Merge commit '3d8d22e' into merge2
  Merge commit 'c5fca4f' into merge2
  Merge commit 'e084cf0' into merge2
  Merge commit '554f349' into merge2
  Merge commit '9c5c993' into merge2