Merge branch 'master' into overleaf-2019-10-22-1621