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