Last updated from avalon
Merge branch 'master' of git://github.com/auv-avalon/bundle