Sync'd branch integration/inbound with upstream @ Mon Nov  3 19:16:43 PST 2014