Merge branch 'wordpress'

Conflicts:
	src/config.codekit