New features from upstream/master

Included in the Autotools the new features implemented on the
upstream/master branch