Imported Upstream version 3.4
Imported Upstream version 3.5