delete extra lines.
Merge branch 'indigo' into hydro-devel