Merge branch 'master' into routing

3rdparty/Sabre/CalDAV/CalendarQueryValidator.php

3rdparty/Sabre/CalDAV/Plugin.php

3rdparty/Sabre/CalDAV/Version.php

3rdparty/Sabre/CardDAV/Plugin.php

3rdparty/Sabre/DAV/Locks/Plugin.php

3rdparty/Sabre/DAV/Version.php

3rdparty/Sabre/HTTP/BasicAuth.php

3rdparty/Sabre/HTTP/Version.php

3rdparty/Sabre/VObject/Component/VEvent.php

3rdparty/Sabre/VObject/RecurrenceIterator.php

3rdparty/Sabre/VObject/Version.php

apps/admin_audit/appinfo/info.xml

apps/bookmarks/ajax/addBookmark.php

apps/bookmarks/ajax/delBookmark.php

apps/bookmarks/ajax/editBookmark.php

apps/bookmarks/ajax/recordClick.php

apps/bookmarks/ajax/updateList.php

apps/bookmarks/l10n/bg_BG.php

apps/bookmarks/l10n/ca.php

apps/bookmarks/l10n/de.php