cfg template
Merge branch '14.06'

Conflicts:
	config/configurations/template