Merge branch 'release/release-2-17-2014_1_5_9' into develop
Changelog update:
Merge branch 'release/release-2-26-2014_1.6.0'