Uploading changes from dnagle  --author='David Nagle <david@randomfrequencynet.net>' .