PR #380

PR #380 is not in the merge queue.