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