Merging mesh into master.

Keeping mesh branch open.