disable legacy test that sometimes stops on travis
Merge remote-tracking branch 'origin/master'