2.6.0
f3a30a79 · Merge branch '2_5_to_2_6_bug_107' ·