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