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