PR #409

PR #409 is not in the merge queue.