Merge branch 'lingua-extractor' of https://bitbucket.org/wichert/mako