PR #402

PR #402 is not in the merge queue.