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