@gtribello I have to revert this since it fails on travis.
Can you please fix it and add it again on v2.4 (then merge, as you did)?

Thanks!

This reverts commit ce4bbf4e.