Merge branch 'raphael'