Pull latest Lori's fixes. Merge master branch changes into cbl_master/plugfest36. 

Pull latest Lori's fixes. Merge master branch changes into cbl_master/plugfest36.