Imported Upstream version 0.2.4
Merge tag 'upstream/0.2.4'

Upstream version 0.2.4
New upstream release.