Updates from ShareLaTeX
Merge sharelatex-2014-12-09-1635 into master