PR #393

PR #393 is not in the merge queue.