Sync'd branch integration/inbound with upstream @ Tue Nov 11 14:04:55 PST 2014