Updated contributor information.
concluding merge