Upgrade to terrarium master