Updates from ShareLaTeX
Merge sharelatex-2014-12-11-1713 into master