Synched with upstream changes
http://devel.frontaccounting.com/git/?p=fa-stable.git;a=commit;h=f6f02cc789c66c6807fb612ae02a6908f46e60f9