Imported Upstream version 1.5.5+dfsg
Merge remote-tracking branch 'hlieberman/upstream' into upstream
Merge remote-tracking branch 'hlieberman/upstream' into upstream
Imported Upstream version 1.6.2+dfsg