Updates from ShareLaTeX
Merge sharelatex-2014-12-07-0821 into master