Updates from ShareLaTeX
Merge sharelatex-2014-11-18-1007 into master