template config updated for #767
Merge branch '14.06'