test commit
more #include <sstream>
Merge branch 'master' into variable_groups