- bz#629286, apply patch to fix broken thread handling
    - bz#627553, #define in included file in different directory not handled properly
    - Inherited documentation doesn't work in case of multiple inheritance