Many new 3.6 packages, updated mask file