merge drone.sh fix to 0.17