Update to the new version of this file from the master.  It displayed a conflict when I attempted the pull request.