Merge branch 'core/futexes' into core/core