github/grocer — pull request #1 by maddox (2014-09-22 17:51:23+00:00)
Title: Pull in 6.0

This merges the new stuff on the original fork, into the one we're using.