Fix nav warnings
Merge branch 'master' into STABLE