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