Merge pull request #428 from sipa/mintxfeefix