Fix broken compile due to previous commit :(
Merge branch 'master' into 4.0.x (unbreak compile)