Merge branch 'master' of https://github.com/awhitten/gmacs
Merge branch 'master' of https://github.com/awhitten/gmacs