Sync'd branch integration/inbound with upstream @ Mon Nov  3 02:04:55 PST 2014