PR #368

PR #368 is not in the merge queue.