Cherry-picked master commit.
Javadoc.
Conflicts:
	src/SemaphoreAlley.java