Merge branch 'release-2014-10-03' into develop
Merge branch 'develop'