Fix items for clients < 1.4.6
Merge remote-tracking branch 'origin/master' into KeirJames