Merge master to 0.6