updated for version 7.4.488
Problem:    test_mapping fails for some people.
Solution:   Set the 'encoding' option. (Ken Takata)
Added tag v7-4-488 for changeset 3ec6e0ef4a67