Sync'd branch integration/inbound with upstream @ Tue Nov  4 04:16:38 PST 2014