Merge branch 'master' into test

Conflicts:
	666.txt
w
Merge branch 'test' of https://github.com/goper/git.loc into test