show manufacturer and year on machine name
Merge branch 'enhancements'