Merge branch 'master' into develop
nuke AC_DISABLE_SHARED
Merge branch 'develop'