Changes for Eyescale/Equalizer#328