Merge branch 'custom_interface_classes' of http://git.nodespaghetti.club/ns/mantis into custom_interface_classes