2.6-20131014
9ce872e4 · Merge branch 'release-2.6-20131014' ·