Dev master

Bringing in updates from master