Sync'd branch integration/inbound with upstream @ Tue Nov  4 20:58:41 PST 2014