Empty content is not anymore added to resulting template.
Merge remote-tracking branch 'origin/master'