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