Sync'd branch integration/inbound with upstream @ Thu Nov  6 16:24:05 PST 2014