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