Merge branch 'batman'