Updates from ShareLaTeX
Merge sharelatex-2014-12-08-1320 into master