Merge branch 'master', remote-tracking branch 'origin'
Merge remote-tracking branch 'origin/master'
Adding type1, type2 sort on MEDICATION tags

This will ensure that type1 and type2 can be interchanged for purposes
of equality and hashing on MEDICATION tags.