PR #319

PR #319 is not in the merge queue.