Random commits from lukejohnsmahi's master branch.