Updates from ShareLaTeX
Merge sharelatex-2014-10-24-1657 into master