Merge branch 'bug25936-032' into bug25936-033

diff --cc .travis.yml
Simple merge

diff --cc Makefile.am
index 04ca88a2369be8e42da5b2c49f918730b3b076a1,4d2d9d222adf58f6b1635497ad7043d6911e63e6..08cb8e3e7ee2826c0d1d1bb5c6413fa82707a39a
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -250,7 -248,11 +250,15 @@@ clean-local
        rm -rf $(top_builddir)/src/rust/target
        rm -rf $(top_builddir)/src/rust/.cargo/registry
  
 +if USE_RUST
 +distclean-local: distclean-rust
 +endif
 +
+ # This relies on some internal details of how automake implements
+ # distcheck.  We check two directories because automake-1.15 changed
+ # from $(distdir)/_build to $(distdir)/_build/sub.
+ show-distdir-testlog:
+       @if test -d "$(distdir)/_build/sub"; then \
+         cat $(distdir)/_build/sub/$(TEST_SUITE_LOG); \
+       else \
+         cat $(distdir)/_build/$(TEST_SUITE_LOG); fi