Merge pull request #5031
e2efdf3 amount.h: update license, add header end comment + rem from util.h (Philip Kaufmann)