PR #1033

PR #1033 is not in the merge queue.