Fix bug 1036445 - Travis CI passes once again!