Merge tag 'upstream/0.1.2'

Upstream version 0.1.2
New upstream release, v0.1.2