update to latest CBLite (post merge master)