Minor makefile exe output name change.
Merge remote-tracking branch 'upstream/master'