remove conflict with philippe
Merge remote-tracking branch 'origin/graphictest'