Sync'd branch integration/inbound with upstream @ Wed Nov  5 17:25:42 PST 2014