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