Squashed 'cgilite/' changes from 31fd9a7..13c2995