Development to master merge.

Add line ending.