Merge branch 'master' into typed-log