Imported Upstream version 0.4.18
Merge tag 'upstream/0.4.18'

Upstream version 0.4.18
changelog for 0.4.18-1