Update master

Various cmake fixes.