Updated docstring for the file (mostly to diagnose/solve a git branch/merge problem)