merge conflict change ARGHH
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/cc-cafnr-template-tags.php