PR #363

PR #363 is not in the merge queue.