Sync templates from master as well.

Refs Github issue #22