Fix whitespace in 'test/always.cpp'.
Merge branch 'develop-cherry-pick' into master-cherry-pick