Updates from master branch, cosmetic updates.