Merge "Remove return; statement at fragment shader" into devel/master