PR #324

PR #324 is not in the merge queue.