diff -Nru gdal-2.1.0+dfsg/debian/changelog gdal-2.1.0+dfsg/debian/changelog
--- gdal-2.1.0+dfsg/debian/changelog	2016-05-09 19:28:10.000000000 +0000
+++ gdal-2.1.0+dfsg/debian/changelog	2016-11-09 19:44:45.000000000 +0000
@@ -1,3 +1,11 @@
+gdal (2.1.0+dfsg-1~trusty2) trusty; urgency=medium
+
+  * Update branch in gbp.conf & Vcs-Git URL.
+  * Add upstream patch to fix crash on URLs that are not DODS servers.
+    (LP: #1640360)
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 09 Nov 2016 20:14:03 +0100
+
 gdal (2.1.0+dfsg-1~trusty1) trusty; urgency=medium
 
   * Backported to Trusty.
diff -Nru gdal-2.1.0+dfsg/debian/control gdal-2.1.0+dfsg/debian/control
--- gdal-2.1.0+dfsg/debian/control	2016-05-09 19:23:21.000000000 +0000
+++ gdal-2.1.0+dfsg/debian/control	2016-11-09 19:44:45.000000000 +0000
@@ -60,7 +60,7 @@
                  python-setuptools
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gdal.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal.git -b experimental-2.1
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal.git -b ubuntu/trusty
 Homepage: http://www.gdal.org/
 X-Python3-Version: >= 3.2
 
diff -Nru gdal-2.1.0+dfsg/debian/gbp.conf gdal-2.1.0+dfsg/debian/gbp.conf
--- gdal-2.1.0+dfsg/debian/gbp.conf	2016-04-17 11:58:49.000000000 +0000
+++ gdal-2.1.0+dfsg/debian/gbp.conf	2016-11-09 19:44:45.000000000 +0000
@@ -6,7 +6,7 @@
 
 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").
-debian-branch = experimental-2.1
+debian-branch = ubuntu/trusty
 
 # git-import-orig uses the following names for the upstream tags.
 # Change the value if you are not using git-import-orig
diff -Nru gdal-2.1.0+dfsg/debian/patches/series gdal-2.1.0+dfsg/debian/patches/series
--- gdal-2.1.0+dfsg/debian/patches/series	2016-04-18 17:59:40.000000000 +0000
+++ gdal-2.1.0+dfsg/debian/patches/series	2016-11-09 19:44:45.000000000 +0000
@@ -8,3 +8,4 @@
 java.opt
 perl-vendor
 privacy-breach-logo.patch
+svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch
diff -Nru gdal-2.1.0+dfsg/debian/patches/svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch gdal-2.1.0+dfsg/debian/patches/svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch
--- gdal-2.1.0+dfsg/debian/patches/svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch	1970-01-01 00:00:00.000000000 +0000
+++ gdal-2.1.0+dfsg/debian/patches/svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch	2016-11-09 19:17:10.000000000 +0000
@@ -0,0 +1,30 @@
+Description: DODS: fix crash on URL that are not DODS servers
+Author: Even Rouault <even dot rouault at spatialys dot com>
+Origin: https://trac.osgeo.org/gdal/changeset/36175
+Bug: https://trac.osgeo.org/gdal/ticket/6718
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdal/+bug/1640360
+
+--- a/frmts/dods/dodsdataset2.cpp
++++ b/frmts/dods/dodsdataset2.cpp
+@@ -496,6 +496,8 @@ char **DODSDataset::CollectBandsFromDDSV
+ /* -------------------------------------------------------------------- */
+     BaseType *poVar = get_variable( GetDDS(), oVarName );
+ 
++    if( poVar == NULL )
++        return papszResultList;
+     if( poVar->type() == dods_array_c )
+     {
+         poGrid = NULL;
+@@ -1024,7 +1026,11 @@ DODSDataset::Open(GDALOpenInfo *poOpenIn
+ /*      Did we get any target variables?                                */
+ /* -------------------------------------------------------------------- */
+         if( CSLCount(papszVarConstraintList) == 0 )
+-            throw Error( "No apparent raster grids or arrays found in DDS.");
++        {
++            CPLDebug( "DODS", "No apparent raster grids or arrays found in DDS.");
++            delete poDS;
++            return NULL;
++        }
+ 
+ /* -------------------------------------------------------------------- */
+ /*      For now we support only a single band.                          */