Holy shit
Merge remote-tracking branch 'origin/devel' into stable

Conflicts:
	Makefile
	src/put.cpp