Fix Trac 1408 and 1409, release new upstream

Fix Trac 1408 and 1409 (needed for liblocker-ng)