merge phusion branch into master