Imported Upstream version 0.6+svn21
Merge tag 'upstream/0.6+svn21'

Upstream version 0.6+svn21
Merged latest upstream snapshot. (Closes: #757079)