Mifosx 1523

the changes have not been merged with upstream....