Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/core/lombok/eclipse/handlers/HandleBuilder.java
#	src/core/lombok/eclipse/handlers/HandleConstructor.java
#	src/core/lombok/javac/handlers/HandleBuilder.java
#	src/core/lombok/javac/handlers/HandleConstructor.java

1 files changed, 15 insertions, 0 deletions

diff --git a/test/transform/resource/before/EqualsAndHashCodeNestedShadow.java b/test/transform/resource/before/EqualsAndHashCodeNestedShadow.java
new file mode 100644
index 00000000..2b0c4fa3
--- /dev/null
+++ b/test/transform/resource/before/EqualsAndHashCodeNestedShadow.java
@@ -0,0 +1,15 @@
+interface EqualsAndHashCodeNestedShadow {
+	interface Foo {
+	}
+	class Bar {
+		@lombok.EqualsAndHashCode(callSuper=false)
+		public static class Foo extends Bar implements EqualsAndHashCodeNestedShadow.Foo {
+		}
+	}
+	
+	class Baz {
+		@lombok.EqualsAndHashCode(callSuper=false)
+		public static class Foo<T> extends Bar implements EqualsAndHashCodeNestedShadow.Foo {
+		}
+	}
+}
\ No newline at end of file