Updates from ShareLaTeX
Merge sharelatex-2014-10-14-1158 into master