windup/windup — pull request #355 by jsight (2014-11-19 05:49:17+00:00)
Title: Mbriskar windup 336

Another try (DO NOT MERGE)