Merging release-2014-10-17 into develop