rebasing on Debian jessie (via docker-ruby-2.1.1p76)