Merge branch 'master' into boehm-demers-weiser-gc