This is really the pull request from tmrts, but as a novice git user, I couldn't figure out how to do the merge after there were some other changes, so I did it manually. Sorry that you don't get official credit, tmrts, but thanks!