Fixed security generation to allow windows installer to run correctly
Merge remote-tracking branch 'origin/develop' into develop