Merge "Add GlWindow" into devel/master