Reviewed: Update comment link and fixed space in t() function
Merge remote-tracking branch 'origin' into release