merge in newest commits from nakkaya