Should fix #21 and #20
Merge remote-tracking branch 'origin/master'

Conflicts:
	v2/pages/my-profile.php