Alamo has changed hostname
Merge branch 'master' into phantom0.2