sad
Merge branch 'master' into devel

Conflicts:
	file1
Merge pull request #1 from Garffan/devel

sad