Remotes/trunk

Merge trunk into 2.7.x