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