PR #350

PR #350 is not in the merge queue.