Imported Upstream version 0.3.6
Merge tag 'upstream/0.3.6'

Upstream version 0.3.6
New upstream version.