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