Merge branch 'develop'
Mark as 2.6.6