Add 'thanks' notes
Merge branch 'develop'