Sync'd branch integration/inbound with upstream @ Thu Nov  6 04:21:42 PST 2014