Merge Reaction renderer features, remove "#ifdef REACTION"s
Merge branch 'reactionmerge'
Merge remote-tracking branch 'upstream/master'