Develop merge of bugfix branch

Make the delete task not fail if the build dir does not exist.