Merge branch 'master' into typescript

Seto Elkahfi committed Jan 4, 2020 at 23:04 UTC 2516254ebc287479a08c3bbd6ab697d56564c80b

No changes.