Merge branch 'bug25936-029' into bug25936-031

diff --cc .travis.yml
Simple merge

diff --cc Makefile.am
index 79d2e785215ca69679a24d5ad1f6afd425861ec0,f06d0e37341167e20c138be8cee9f7648fce0591..1a6d8e7d12e145f2baf73f9e89faaeaf01d87b6f
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -237,6 -217,11 +237,15 @@@ mostlyclean-local
        rm -rf $(top_builddir)/doc/doxygen
        rm -rf $(TEST_NETWORK_ALL_LOG_DIR)
  
 +clean-local:
 +      rm -rf $(top_builddir)/src/rust/target
 +      rm -rf $(top_builddir)/src/rust/.cargo/registry
++
+ # 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