am c61aabfa: Merge "Update material colors" into lmp-dev

* commit 'c61aabfa22e972a5173d2edc2aa5fd77fb37bdf9':
  Update material colors