0.97
Merge remote-tracking branch 'RE_EQ/master'