Manual merge of pull request 121