Imported Upstream version 3.1.5
Imported Upstream version 3.1.8