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