Updates from ShareLaTeX
Merge sharelatex-2014-10-06-1219 into master