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