PR #346

PR #346 is not in the merge queue.