Merged in iPoker archive update 2c24581