Removed extra line
Merge branch 'public' into develop