Added missing use statement
Yay class name conflicts!
Merge remote-tracking branch 'origin/master' into cake3