Minor tidy-up from previous merge commit: Prefer explicit return statement
Changes entry for previous merge commit
Release 3.03