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