removed trailing whitespace
merged branch 2.0.x into 2.1.x