Sync'd branch integration/inbound with upstream @ Mon Nov  3 06:40:52 PST 2014