Merge remote-tracking branch 'origin/master' into nat_fold_finRange