Sync'd branch integration/inbound with upstream @ Mon Nov  3 09:47:43 PST 2014