Version bump to 0.6.2
Merge remote-tracking branch 'upstream/master'