Updates from ShareLaTeX
Merge sharelatex-2014-10-07-1404 into master