PR #399

PR #399 is not in the merge queue.