Sync'd branch integration/inbound with upstream @ Mon Nov  3 12:02:42 PST 2014