Sync'd branch integration/inbound with upstream @ Tue Nov  4 07:18:35 PST 2014