Manual merge of bug60-fix into 4.1-lbnl.