Merging from lastest stable changes
Merge branch 'master' into two-dot-o