PR #379

PR #379 is not in the merge queue.