Initial commit on 2.x branch.
Merge pull request #1 from wet-boew-wem/7.x-2.x

Merge Fixes from 2.x branch to 1.x branch.