Merge branch 'max/master' into 'master'. Keep libraries untouched.