Merge in fixes up to 1.0.3 maintenance branch.