Fixes #1560 - Type-safety added to two places to prevent crashes
Merge branch 'release/4.0.2' into develop

Conflicts:
	WordPress/Classes/Note.m