Fixing derp from earlier
Merge remote-tracking branch 'origin/dev-Texasjake95'