Imported Upstream version 0.2.2
Merge tag 'upstream/0.2.2'

Upstream version 0.2.2
Bump to 0.2.2