Merge branch 'master' into 4.next

diff --combined src/src/sieve.c
index 3bb10785b8948389d5a28b92ae54bb2d3f0f1e62,f4ce58402f5e7f7a32e39bd93dff6b24c7f54316..5d6b611c37eecb109e55f1a3e7a5f23ba52e8836
--- 1/src/src/sieve.c
--- 2/src/src/sieve.c
+++ b/src/src/sieve.c
@@@ -3,7 -3,7 +3,7 @@@
  *************************************************/
  
  /* Copyright (c) Michael Haardt 2003 - 2015
-  * Copyright (c) The Exim Maintainers 2016
+  * Copyright (c) The Exim Maintainers 2017
   * See the file NOTICE for conditions of use and distribution.
   */
  
@@@ -3381,7 -3381,6 +3381,7 @@@ while (*filter->pc
              {
              uschar *mime_body,*reason_end;
              static const uschar nlnl[]="\r\n\r\n";
 +          gstring * g;
  
              for
                (