Updates from ShareLaTeX
Merge sharelatex-2014-12-10-2208 into master