Updates from ShareLaTeX
Merge sharelatex-2014-12-04-1500 into master