Updates from ShareLaTeX
Merge sharelatex-2014-11-24-1643 into master