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