Manually merge in changes from Pull Request #213 via @palewire.