PR #358

PR #358 is not in the merge queue.