coalesce licenses
reorder (c)
Merge branch 'browserid' into browserid-sad