Merging from nolanlawson, minifying.