Update master to opal 0.6.0