Merge pull request #12 from moqui/master

Periodic update
Merge pull request #13 from moqui/master

Periodic update
Merge pull request #10 from sssonline/master

10
Merge pull request #14 from moqui/master

Periodic update
Merge pull request #11 from sssonline/master

11
Merge pull request #15 from moqui/master

Upstream update
Merge pull request #12 from sssonline/master

12