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