migrate to 1.6 while it's still not that much to do :)