Updated for 1.6 release