am 944edb56: Merge "Switch to the new mmma implementation using make goals."

* commit '944edb562b67bdf8e052bb292629afd365086df1':
  Switch to the new mmma implementation using make goals.