Merge "Fix 2 warning when building with GCC 5." into nextgenv2