- fix building with gcc 4.7+
- rel 6