Fix errors with texinfo 5

Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
Update NEWS

Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
Bump version number to 1.2.5
Merge branch '1.2-bugfix'

Conflicts:
	NEWS