Add changelog
Merge branch 'release/20130829.1' into develop