PR #366

PR #366 is not in the merge queue.