Imported Upstream version 1.8.2
Imported Upstream version 1.8.3