remove empty line white spaces

remove all white spaces on a empty line which was not removed by #520.

This branch is rebased against #521, please merge after.