Updated to use java6_dev as the base