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