ENH: C++ compiler in generated makefiles is got from waf configuration
ENH: Edge configuration 'sort_by_source'
FIX: Fixed drawing removed tokens