PR #397

PR #397 is not in the merge queue.