Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts
