Merge branch 'rreuter'