Merge from ShareLaTeX