Test update
Testing update strategy
Merge branch 'master' into linux