Merge remote-tracking branch 'origin/typhoeus' into social.mrzyx.de

Conflicts:
	Gemfile
	Gemfile.lock
	lib/hydra_wrapper.rb