Update from latest Blefish source