Merge from SFTP. Removed the --diag-supress ifdef, as it was only due to me not being able to spell --diag_suppress! (which is supported on all versions of RVCT)

A test file
with several lines
the last of which
ends with a new line