Merge branch 'zuckschwerdt-change-qblexception'
change: dont pollute the namespace in headers