The above change was initially made for testing purpose.  The unit
tests now run the test cases in test_pystache.py twice if markupsafe
is available: once with markupsafe enabled and once without.  All
unit tests now pass using markupsafe (there was previously one
failing test in test_pystache.py: test_non_strings).