Bring in the latest cirros 0.3.1