Fix error when names--edebug-message is passed nil.
Merge branch 'master' into edge