fix do unicorn
Merge branch 'master' into haml