Increased version number to v1.5.2
Merge remote-tracking branch 'upstream/master'