3 typos
Merge branch '1.7' into 1.8

Conflicts:
	lib/Sabre/CalDAV/Backend/SharingSupport.php