scikit-image/scikit-image — pull request #998 by ahojnnes (2014-05-05 18:39:11+00:00)
Title: Several fixes

Based on Stefan's fix for Travis, here a new PR that replaces https://github.com/scikit-image/scikit-image/pull/994.