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