Imported Upstream version 0.2.1
Merge tag 'upstream/0.2.1'

Upstream version 0.2.1
Updated changelog for new upstream version.