Updating Master Page - Component update deletes editable content

I think this might be a duplicate of this report from February.