author api changed, fix test
Merge branch 'master' into tag-order-matters