merge scrutinizer-ci improvements