[bti/f15/master] Improved comment marker fix, now safer and handle lines containing both non-marker and marker '#'s

[Michel Alexandre Salim]

Summary of changes:

  988f89e... Improved comment marker fix, now safer and handle lines con (*)

(*) This commit already existed in another branch; no separate mail sent