Merge commit 'a326c8160fa10c9954e9872f754309b1850d8ff4' * commit 'a326c8160fa10c9954e9872f754309b1850d8ff4': Remove trailing spaces.