Merge commit 'karsten/rendspec-master'