Merge branches 'release' and 'menlo' into release