Merge girlygirl master branch.