Merge branch 'master' of https://github.com/bolitt/py-matchtpl
Merge branch 'master' of https://github.com/bolitt/py-matchtpl