merge updates from  jonesde/moqui