Replace hyphen with underscore
Merge remote-tracking branch 'upstream/0.4.x' into 0.4.x