Imported Upstream version 0.4.17
Merge tag 'upstream/0.4.17'

Upstream version 0.4.17
changelog for 0.4.17-1