Merge commit '85779ce6f7509ef5bfda0e310316a1972262ffff' into Linux

Conflicts:
	.homesick_subdir