fork
Merge commit '8947b5e'

Conflicts:
	.gitmodules