PR #335

PR #335 is not in the merge queue.