PR #313

PR #313 is not in the merge queue.