Merge branch 'maint-0.2.9' into maint-0.3.1

diff --cc .travis.yml
index 0c01884106a690ab3971f8a49dcc6fd78f2268b2,dc0a8ac67a2198ba996b2cc228a89feaa83998af..bf55b7756a4f3dc031037f53a004d280d2c81bbe
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -95,8 -88,8 +95,10 @@@ matrix
    ## entry under that key outside the "include" clause.
    include:
      - compiler: gcc
 +    - compiler: gcc
 +      env: RUST_OPTIONS=""
+     - compiler: gcc
+       env: COVERAGE_OPTIONS="--enable-coverage"
      ## The "sudo: required" forces non-containerized builds, working
      ## around a Travis CI environment issue: clang LeakAnalyzer fails
      ## because it requires ptrace and the containerized environment no
@@@ -111,7 -101,8 +113,8 @@@ before_install
    ## If we're on OSX, homebrew usually needs to updated first
    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
    ## Download rustup
 -  - curl -Ssf -o rustup.sh https://sh.rustup.rs
 +  - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi
+   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi
  
  install:
    ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above)