Imported Upstream version 6.3.2
Merge pull request #1 from vmx/upstream-new-release

Imported Upstream version 6.3.2