free the goose #SGoo-42 Fixed
Merge remote-tracking branch 'master/preview_master' into preview_master