PR #331

PR #331 is not in the merge queue.