[1.2.0] Release
releaseommit.
Merge 'master' into portable