Fix max_lines markup bug, merge versionadded.