PR #351

PR #351 is not in the merge queue.