Merge commit '1e72b7a4' into development All 56 tests now pass while using Python 2.5.6. Conflicts: pystache/template.py
