PR #126

PR #126 is not in the merge queue.