Merge libck master (0.4.3-6-g747779d) to fix build