Merge changelog from master
Changelog for 2013.8.17