Sync'd branch integration/inbound with upstream @ Thu Nov  6 20:43:46 PST 2014