cleanup
fix build problem on debian
Merge remote-tracking branch 'github/v7-stable' into v7-stable
fix compiler warnings on 64bit platforms
Merge remote-tracking branch 'github/v7-stable' into v7-stable
Merge branch 'v7-stable' into v8-stable