bundler enabled
Merge branch 'bundle'