Merge libck master (0.4.3-5-g84cd66b) to fix out of tree build