minor
Merge pull request #1167 from EPuncker/master

minor