Thanks to #1936174: Convert .info file to .info.yml and friends, and my amnesia when it comes to how I did this 2 months ago, the commit messages in the various branches are now out of order. Need to find someone with some supreme Git fu to help me figure out the rebase commands for it.