Merge branch 'master' of https://github.com/clintbellanger/flare-engine