Update: I just tried upgrading again (from 10.11.1 to 10.11.2) and it seems to have fixed things!