Merge branch 'middleman'