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