merging branches/fu-debug with trunk :)