Fixed file encoding issue with IDE
Merge branch 'master' into v1.1-dev