Armitage Archive

It's important to merge back into develop because critical updates may have been added to the release branch and they need to be accessible to new features.