update some security settings that where invalid.
Merge remote-tracking branch 'origin/master'
minor update