Merged in tests and patches for current 1.4.8 release