Sync'd branch integration/inbound with upstream @ Thu Nov  6 12:26:36 PST 2014