Remove duplicate variable $(OBJ) in make rules
Merge branch 'release/v0.94'