Merge branch 'master' of github.com:tyom/middleman-stratum