PR #336

PR #336 is not in the merge queue.