Merge pull request from teambition: trailing spaces #tdd4d45108239e0b321bbd6fcf6824067fcae8ed9