v1.2.6 ready for distribution
Merge branch 'v1.2.6_prod'