Merged changes from 1.1 back into devel branch.