Move functions to Enable hook

Move functions to 'enable' hook
Merge branch 'master' into 4.5

Conflicts:
	wpbasepage.php