UPGRADE: mpr pak
Merge branch 'dev' of github.com:embedthis/ejs-2 into dev