Check for 2.6 correctly
Merge remote-tracking branch 'upstream/master'