Merge origin/master

Conflicts:
	wp-content/plugins/theme-my-login-custom.php
Merge origin/master