Selective merge with lucasnz git://repo.or.cz/pyTivo/wmcbrine/lucasnz.git