PR #322

PR #322 is not in the merge queue.