Merge pull request #41 from moqui/master

Periodic upstream merge
Merge pull request #42 from moqui/master

Periodic update for some big changes
Merge pull request #43 from moqui/master

Periodic upstream update
Merge pull request #44 from moqui/master

Periodic update