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