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