Imported Upstream version 0.017
Merge tag 'upstream/0.017' into ubuntu-lucid

Upstream version 0.017
Updated changelog for 0.017-1.