Merge branch '2.1.x' into 2.2.x

philwebb · philwebb · commit ee00b57a787e · 2020-06-08T10:50:28.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 .#*
 .*.md.html
 .DS_Store
+.attach_pid*
 .classpath
 .factorypath
 .gradle
