backported security changes
Merge branch '1.5/develop' into 1.5/master
Merge branch '1.5/master' of git://github.com/fuel/core into 1.5/master