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