update cmake branch with master changes