Updates from ShareLaTeX
Merge sharelatex-2014-11-21-0838 into master