Changed from 'Current' being used everywhere.
Merge branch 'master' of github.com:occamsRZR/uhhyeahdude