Fix compile-templates on Linux & OS X
Merge remote-tracking branch 'upstream/master' into travis-linux-x86