Fix to scripts not loading?
Merge remote-tracking branch 'origin/master'