PR #311

PR #311 is not in the merge queue.