PR #340

PR #340 is not in the merge queue.