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