Don't check the stop flag if the build isn't running
Merge branch 'master' into buildPinning