Merge branch 'master' into despora

Conflicts:
	Gemfile.lock