Merge develop into master -- contributors list update