manually merging pullrequests from parisholley