Merge remote-tracking branch 'origin/develop' into issue/2535-add-mentions-comment-notification-replies

Conflicts:
	WordPress/WordPress.xcodeproj/project.pbxproj