Fixed some scripts I managed to break.
Merge remote-tracking branch 'origin/about_time' into about_time