Update 1.1.6
Merge remote-tracking branch 'upstream/master'

Conflicts:
	template-contact.php