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