PR #455

PR #455 is not in the merge queue.