merged-dev
Automatic merging of dev into master

* dev:
  merged-dev