resolved conflicts for merge of f0d83fd9 to master