PR #965

PR #965 is not in the merge queue.