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