Merge "minor clean-up GLclampx -> GLclampf" into kraken