pull in master changes

attempting to pull changes from cPanelChrisD:master into my clone (dreamingkat:master)