PR #378

PR #378 is not in the merge queue.