PR #339

PR #339 is not in the merge queue.