PR #1077

PR #1077 is not in the merge queue.