Merge in changes from trunk

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>