plugin commit for Ondrej
squash