Coverage remained the same at 87.711% when pulling 25114f5 on bnavigator:pytest-timeout into d75c395 on python-control:master.

This looks more than #535 to me. I suggest we merge this and drop #535. Will wait for 8 hours or so in case anyone wants to chime in.

Okay. I just want to make sure you are okay with the fact that we add another test dependency.