PR #362

PR #362 is not in the merge queue.