Support bamboo variables, and bin/grunt losing +x