No need for 2.06 becuase it was never live
Merge branch 'master' into dev