Removed extra line
Merge branch 'master' into edge