Fix git log pretty format argument
Fix node-info to show right node version

Currently, node-info shows nothing if $version is different than 'none'.
Merge remote-tracking branch 'upstream/master'