PR #337

PR #337 is not in the merge queue.