Squashed 'cgilite/' changes from a836764..31fd9a7