Mostly null merge from 2.6; tag added

diff --cc .hgtags
index 55cfce9a9add8465c548b7909b623457e99b8e4e,5bcf0f04c32af198ade9e43de0889954b9bec456..5681a12b4e800be50885efb34e58ffc6752f0a8f
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -139,19 -139,4 +139,20 @@@ e189dc8fd66154ef46d9cd22584d56669b544ca
  9f8771e0905277f8b3c2799113a062fda4164995 v2.6.6
  caab08cd2b3eb5a6f78479b2513b65d36c754f41 v2.6.8rc1
  1d1b7b9fad48bd0dc60dc8a06cca4459ef273127 v2.6.8rc2
+ c9910fd022fc842e5578e1bf5a30ba55a37239fc v2.6.8
 +b4107eb00b4271fb73a9e1b736d4f23460950778 v2.7a1
 +adc85ebc7271cc22e24e816782bb2b8d7fa3a6b3 v2.7a2
 +4180557b7a9bb9dd5341a18af199f843f199e46e v2.7a3
 +d2e1027edde84a02853fcf9790f311f10f46cf0a v2.7a4
 +61550a1302b07a731436a84b2d86eb2bab3b2fb0 v2.7b1
 +6bb9891d4275bd42a69b3d903d13b687543c915d v2.7b2
 +381c5eeb511038d091d8e0808c4b85087ed2f684 v2.7rc1
 +13e5b0b2071a2a42067fb03facc931409fa6ba50 v2.7rc2
 +2145593d108de62ebf770987a4ac2a57d268c9d1 v2.7
 +63d9f00fea0730c1c437a50f64a42b7792bdcbfb v2.7.1rc1
 +5395f96588d4f0199d329cb79eb109648dc4ef5e v2.7.1
 +f48756685406e8d0fa9d23d841fceb07e36a5656 v2.7.2rc1
 +8527427914a29d895bcb30be76a465143993a793 v2.7.2
 +b2c6aff96e1251a4f03cf866e7e75fb8232869f2 v2.7.3rc1
 +d46c1973d3c407ecaa6a8ee16d3fad3ef506b51f v2.7.3rc2
 +70274d53c1ddc60c5f9a2b8a422a49884021447c v2.7.3