PR #372

PR #372 is not in the merge queue.