Updates from ShareLaTeX
Merge sharelatex-2014-11-26-2112 into master