Develop vs Master

Yeah...we shouldn't have these changes.  We need to figure out what happened and tag ShareJS if we need these.