Minor changes to improve robustness during optimization
Merge branch 'master' of https://github.com/raptorjs/raptorjs