Fixing gcc4.7 commit merge from Codeworkx