Imported Upstream version 0.3.2
Merge tag 'upstream/0.3.2'

Upstream version 0.3.2
Packaging updates for 0.3.2 upstream