`skimage.filter`
Merge branch 'inpaint' of https://github.com/chintak/scikit-image into inpaint

* 'inpaint' of https://github.com/chintak/scikit-image:
  Change for Travis test

Conflicts:
	skimage/filter/inpaint.py