Pull master into devel.

Continue on devel for now