wet-boew/wet-boew — pull request #1671 by jolevesq (2013-03-26 16:12:32+00:00)
Title: Fix for issues 1611 and 1621

The commits from March 22, was part of another pull request. They should not be there.