PR #325

PR #325 is not in the merge queue.