Merge changes from topic 'mwd-merge-050415' into mnc-dev

* changes:
  Merge commit 'b6f59f48' into master_merge
  Merge commit 'f6db0ce6' into master_merge
  Merge commit '17455a3d' into master_merge
  Merge commit 'b4d5b320' into master_merge
  Merge commit 'a1a2fa79' into master_merge
  Merge commit '8dfdb989' into master_merge
  Merge commit 'eba66c37' into master_merge