Merge remote-tracking branch 'upstream/master' into 2

Conflicts:
	src/main/java/com/jcabi/github/RtUser.java