Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of http://github.com/josephbleau/flare-engine