MifosX-855: Ready for pull request