Merge "Revert "Revert "Import external/python/jinja into master"""