Adds machine name to data-attr
Merge branch 'scott_dev'