merge of master into kstoertebecker