From: https://github.com/talos/pystache/commit/c8138f41c3a89523502d57d95f1da30c9d211b9e Into: v0.4.0-prep
