PR #960

PR #960 is not in the merge queue.