Merge Pullrequests

Merge two pullrequest branches into master