Fix invalid reformatting (LF must be used in sources, not Windows CRLF, also double indentation was removed).
Fix merge issue that removed all staff from developer branch :-).
Undo my stupid mistake (I have pushed issue-957 to master instead of develop). Do I have copied files from GitHub master and push them back..
Merge from SVN branch 1.2.