Merge pull request #1 from moqui/master

Periodic sync back to base repo
Merge pull request #2 from moqui/master

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

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

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

Periodic update