Fixed last merge of branch "master".
Fixed double header line (typo from previous merge task).