This is an update for latest-version for master

Changes were done directly on master and now we have merge conflicts when trying to merge latest-version into master https://github.com/mozilla/moz-grid-config/pull/140