Merge "pass Language to wfMessage() calls"