PR #416

PR #416 is not in the merge queue.