return statements now show their expression in case one is contained, even if the containing function has void as return type
Merge remote-tracking branch 'origin/master'