Merged in genslow-sharepoint-autohosted branch. Resolving conflicts.