PR #391

PR #391 is not in the merge queue.