PR #2511

PR #2511 is not in the merge queue.