[gmime: 4/4] Merge branch 'master' into gnome-master

[Jeffrey Stedfast <fejj src gnome org>]

commit b4bdda8775813cb46d1a32a2179232efff9496e2
Merge: b80cb34 2f91a9d
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Sat Apr 8 10:46:31 2017 -0400

    Merge branch 'master' into gnome-master

 configure.ac                 |   25 +++++++-
 gmime/Makefile.am            |    2 +-
 gmime/gmime-format-options.c |   14 +++-
 gmime/gmime-format-options.h |   15 +----
 gmime/gmime-parser-options.c |   11 +++-
 gmime/gmime-parser-options.h |   11 +---
 gmime/gmime-utils.c          |   15 ++++
 gmime/internet-address.c     |  152 ++++++++++++++++++++++++++++++++++++------
 gmime/internet-address.h     |    6 ++-
 9 files changed, 198 insertions(+), 53 deletions(-)
---