Update pubspec.yaml as suggested by pub
Merge branch 'master' into devel