For some reason the texture didn't switch, hmm...
Merge branch 'dev'