Initial upstream branch.
Imported Upstream version 3.0.1
Imported Upstream version 3.0.4