PR #370

PR #370 is not in the merge queue.