PR #348

PR #348 is not in the merge queue.