Merge pull request #8 from alibuild/alibot-cleanup-12904

Please consider the following formatting changes to #12904

Author: tutripat