PR #360

PR #360 is not in the merge queue.