merge fix due to 1.4.X still using nose