Sync'd branch integration/inbound with upstream @ Wed Nov  5 08:52:46 PST 2014