PR #435

PR #435 is not in the merge queue.