merged phusion branch in here
merged