OSX needs longer timeout again.
OSX is even slower.
Merge branch 't/11416'