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