Merge branch 'master' into integration
Dog make noise
Duck make noise