Adding from gingr-dev machine. Remember that...
Merge https://github.com/leesalminen/gingr