Updates from ShareLaTeX
Merge sharelatex-2014-11-14-1250 into master