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