PR #491

PR #491 is not in the merge queue.