PR #122

PR #122 is not in the merge queue.