Updates from ShareLaTeX
Merge sharelatex-2014-10-13-1437 into master