Merge branch 'release/release-2-11-2014_1_5_8' into develop
Update changelog
Merge branch 'release/release-2-17-2014_1_5_9'