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

Upstream version 0.018
Updated changelog for 0.018-1.