Merge origin/master

Conflicts:
	src/main/java/com/example/RunMemoryLeakStack.java
Merge origin/master