bug fix for release 1.1
Another fix
Merged Release-1.1 branch