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