wajam/nrv — pull request #287 by mlaflamm (2014-02-26 19:02:59+00:00)
Title: Undo merge that WASN'T ready to be done YET!

Revert #286