Merge pull request #47 from moqui/master

Periodic update
Merge pull request #48 from moqui/master

Upstream update