Merge branch 'master' of https://github.com/Eyescale/Equalizer
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Merge pull request #315 from tribal-tec/master

Fix Win32 build
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Update generated files to fix Travis