Merge branch 'release/0.4.0.6' into develop
PEAR repo put back. Too busy to rewrite MS's code...
Release prep
Merge branch 'release/0.4.0.7'