Merge branch 'default' into kernigh-linuxppc
authorGeorge Koehler <xkernigh@netscape.net>
Sat, 14 Oct 2017 17:50:49 +0000 (13:50 -0400)
committerGeorge Koehler <xkernigh@netscape.net>
Sat, 14 Oct 2017 17:50:49 +0000 (13:50 -0400)
This merges several fixes and improvements from upstream.  This
includes commit 5f6a773 to turn off qemuppc.  I see several failing
tests from qemuppc; this merge will hide the test failures.


Trivial merge