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