Updates from ShareLaTeX
Merge sharelatex-2014-10-02-1347 into master