PR #412

PR #412 is not in the merge queue.