PR #330

PR #330 is not in the merge queue.