Corrected dev-master to 3.0 branch.