panther salve toggle fix
DoN unlock fix
Merge remote-tracking branch 'origin/master' into gh-pages