Merge trunk and master

Bring the current trunk into the master