Merge remote-tracking branch 'upstream/master' into refactor-api-shapes

...uebutton-html5/imports/api/cursor/server/eventHandlers.js

...-html5/imports/api/cursor/server/handlers/cursorUpdate.js

bigbluebutton-html5/imports/api/cursor/server/index.js

bigbluebutton-html5/imports/api/cursor/server/methods.js

...-html5/imports/api/cursor/server/modifiers/clearCursor.js

...orts/api/cursor/server/modifiers/clearCursorCollection.js

...tml5/imports/api/cursor/server/modifiers/eventHandlers.js

...5/imports/api/cursor/server/modifiers/initializeCursor.js

...html5/imports/api/cursor/server/modifiers/updateCursor.js

...ports/api/cursor/server/modifiers/updateCursorLocation.js

...luebutton-html5/imports/api/cursor/server/publications.js

bigbluebutton-html5/imports/api/cursor/server/publishers.js

...html5/imports/api/meetings/server/modifiers/addMeeting.js

...-html5/imports/api/slides/server/modifiers/clearSlides.js

bigbluebutton-html5/server/main.js