merge release version 3.0.6 to master