Updates from ShareLaTeX
Merge sharelatex-2014-11-23-1745 into master