PR #341

PR #341 is not in the merge queue.