PR #381

PR #381 is not in the merge queue.