Merge branch 'master' into development
Merge branch 'bento' into development
Merge branch 'bento' into development
Merge branch 'bento' into development
Convert delete script to rake task.