Updates from ShareLaTeX
Merge sharelatex-2014-12-02-1250 into master