disapproval of revision '58d974c51750142a5e59f6b5c18c844d9f5eaab8'
merge of '456dd8b5de81a68896b75b3f51e8103094fde536'
     and 'f9a6957f43228491a84bf1e868fb348ecb3feba9'