Merge branch 'release/4.0.2' into develop

Conflicts:
	WordPress/Classes/Note.m