sall/vixen — pull request #35 by billlutton (2013-09-19 05:28:24+00:00)
Title: Proposed merge

Pulled together Jeff's and Daren's latest and added small fix of my own...