PR #390

PR #390 is not in the merge queue.