Merge "Fix some RecentChange phpdoc return types"