Merge commit '300e4008f02382b87409dabb52a317b8336de55b' into integrated

Conflicts:

	nest/neighbor.c

diff --cc nest/neighbor.c
index 64e907efc549ce9cb7ffa140a7ef6dc37819f6f4,48b6b6ac888805e3ea13f265e594e23f0b040838..aba2338cf4ed49310d2c355c07cabd3bc014725f
--- 1/nest/neighbor.c
--- 2/nest/neighbor.c
+++ b/nest/neighbor.c
@@@ -79,7 -85,11 +85,10 @@@ if_connected(ip_addr *a, struct iface *
              if ((b->pxlen < (BITS_PER_IP_ADDRESS - 1)) &&
                  (ipa_equal(*a, b->prefix) ||  /* Network address */
                   ipa_equal(*a, b->brd)))      /* Broadcast */
+             {
+               *ap = NULL;
                return -1;
 -#endif
+             }
  
              return b->scope;
            }