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