Forgot to change manifest out of testing mode.
Merge branch 'dev-stable' into dev-unstable