backported security changes
Merge branch '1.5/develop' into 1.5/master
Merge remote-tracking branch 'fuel/1.5/master' into 1.5/master