Merge branch 'master' into revc1i2c
Merge branch 'master' into revc1i2c
merge improvements from experimental branch
apparently this only works if DEBUG is defined, go figure...
it seems this is somehow related to those debug output macros...
this works so it has definitely *somethign* to do with these debug statements
restore the #ifdef
restore default timeout
ix merge conflict