Manual merge of pull request #394