Manual merge of pull request #28.