PR #375

PR #375 is not in the merge queue.