Sync'd branch integration/inbound with upstream @ Thu Nov  6 03:00:41 PST 2014