2.6-20131107
bbb0e6fa · Merge branch 'release/2.6-20131107' ·