Minor changes
Merge branch 'wpml' of https://github.com/atkore/atkore-international into wpml

Conflicts:
	lib/custom.php
ACF Updates to Merge