Updating: renaming *_s2Var to *_s2vvar
Merge remote-tracking branch 'upstream/master'