PR #310

PR #310 is not in the merge queue.