Merge remote-tracking branch 'upstream/master' into travis-add-autotools-build