pulling in latest changes from dagoba repo