Updates from ShareLaTeX
Merge sharelatex-2014-11-04-1504 into master