PR #406

PR #406 is not in the merge queue.