Merge branch 'middleman' into master