PR #369

PR #369 is not in the merge queue.