PR #425

PR #425 is not in the merge queue.