don't include BASE if there's no print string
Merge branch 'master' into matrix