Initial upstream branch
Imported Upstream version 0.7