Update buildr
Merge branch 'update_buildr'