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