Sync'd branch integration/inbound with upstream @ Mon Nov  3 19:04:46 PST 2014