Initial commit
Imported Upstream version 1.3.7