Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
update wallet debug printing, fix output_reference hash method
Merge remote-tracking branch 'upstream/master'