Merge pull request #1878 from shackbarth/dot