grinsfem/grins — pull request #170 by pbauman (2014-11-20 16:20:26+00:00)
Title: Fix vikrams branch

This supplants #169. I'm happy with this if @roystgnr is.