Imported Upstream version 0.1.2
Merge tag 'upstream/0.1.2'

Upstream version 0.1.2