Merge pull request #1271 from anthrotype/pr/1211

rebase #1211