PR #344

PR #344 is not in the merge queue.