Merge pull request #4 from moqui/master

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

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

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

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

Periodic update
Merge pull request #9 from moqui/master

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

Periodic update