Merged changes to magaziner