Support for getDistro() api
Merge remote-tracking branch 'upstream/master'

Conflicts:
	configure.ac