Merge pull request #763 from nupplaphil/replacing_goaway