Add version reporting
Merge remote-tracking branch 'origin/devel' into devel
Merge branch 'devel'
Remove unused stuff