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