PR #309

PR #309 is not in the merge queue.