Merge "Fix wrong framebufferspace computation"