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