tested and updated #9757#
Merge branch 'release20130102' of github.com:philfree/ofuz into release20130102