PR #323

PR #323 is not in the merge queue.