Fixed bad merge.

Whitney Armstrongrequested to merge
fix into master
  • I have also turned on the FF only merges

Merge request reports