Fixed broken test caused by adding copyright comment to test source file. Really.
Merge branch 'master' of https://github.com/mischasan/util