Normalized line separators
Normalized line separators
Merge branch '2.0-dev' into 2.0-master