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

[Jeffrey Stedfast <fejj src gnome org>]

commit 42a311b013fb55af40110f60a94267a6f16d9c53
Merge: 333d2bd 3410066
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Fri Apr 14 11:35:12 2017 -0400

    Merge branch 'master' into gnome-master

 gmime/gmime-filter-enriched.c |   39 +++++++++++---------
 tests/test-cat.c              |   80 ++++++++++++++++++++++++++++++++++-------
 tests/test-streams.c          |   28 ++++++++++----
 3 files changed, 108 insertions(+), 39 deletions(-)
---