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