converted to unix line encoding
Finish 1407 Release branch - merge to master and develop