Merge "Fix @Ignore on class when it should be on method"