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