Merge branch 'master' into errorevents
CR #247
Merge branch 'errorevents' of https://github.com/Eyescale/Equalizer into errorevents

Conflicts:
	eq/client/agl/window.cpp
	eq/client/channel.cpp
Fix build