Merging in maya and pontus changes to master...