Meeh's patch for trac ticket 729
minor cleanup
propagate from branch 'i2p.i2p' (head ea73fc80c4f4d89238aaa52a9189378e40db0b32)
            to branch 'i2p.i2p.729' (head 148b359103beb356be4dd6833d4e6325703917d3)
propagate from branch 'i2p.i2p' (head 27ab673e76ed77c38d22c06c807695f792473fb0)
            to branch 'i2p.i2p.729' (head d03f39c7afc2214ef8c2f81486d4abc64049e825)
propagate from branch 'i2p.i2p' (head 879c55c825160c979491a99169a173145cf1d7ad)
            to branch 'i2p.i2p.729' (head a0ba4c4c989ba71043b9671a56891688be41b50d)
propagate from branch 'i2p.i2p' (head e91e8d2eb4c76d5be04e48de9b678cb39b3d0694)
            to branch 'i2p.i2p.729' (head c1bf6bf9381192395513aca841d6db507384a9a8)
propagate from branch 'i2p.i2p' (head fd0e22a44acf6b018c394cdd42d75e2d1bdb4986)
            to branch 'i2p.i2p.729' (head b5c7b5601c0b0e810ca6d93c1d249fe4e330a352)
propagate from branch 'i2p.i2p' (head dddff6de3cdc4595886d57b5eceb63747b68c7d7)
            to branch 'i2p.i2p.729' (head b0eb76504d798a791853a6d269795018c853eff9)
propagate from branch 'i2p.i2p' (head 138d50ea0e969564bef41201439c6a99e2a45fbb)
            to branch 'i2p.i2p.729' (head 74c7169e5d428b5aeaf33a401b27c33d3d37907e)
propagate from branch 'i2p.i2p' (head a89e68077114f79902a76649affe78e8ab709787)
            to branch 'i2p.i2p.729' (head 11fde36281469d5ac8757bca1d7f93f679e0cb74)