PR #317

PR #317 is not in the merge queue.