PR #417

PR #417 is not in the merge queue.