Upstream changes: 0.007 Wed Nov 18 13:21:08 2009 - Fixed major bug in gap algorithm for new keys (thanks Jojo!)