Register our command via FML properly

This is a forward compatibility patch. Currently has no real effect.
Merge remote-tracking branch 'remotes/upstream/master'