0.7.5: * Back-ported some changes from svn trunk.