Updates from ShareLaTeX
Merge sharelatex-2014-10-21-1414 into master