Unified the lists of contributors.
Merge branch 'develop' into playground