preparing for 0.5.2.pre1 release, CHANGELOG updated
preparing for 0.5.2 release
Merge remote-tracking branch 'upstream/master'