Updates from ShareLaTeX
Merge sharelatex-2014-10-28-1356 into master