Sync'd branch integration/inbound with upstream @ Thu Nov  6 17:18:47 PST 2014