Merge "DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off." into gingerbread