PR #407

PR #407 is not in the merge queue.