manual merge of some last minute SPEC fixes from 1.1.5 release