Release 0.3.1
Post 0.3.1 release
Merge remote-tracking branch 'upstream/master'