small fix (exceptions to warnings, Lukas Korous)
Merge remote-tracking branch 'mach/master'