Merge remote-tracking branch 'kai/elbenwald-transient' into master

Conflicts:
	elbenwald/elbenwald.rb